Skip to content

fix(amazonq): Merge from main#8533

Merged
manodnyab merged 2 commits intoaws:feature/qOnlyfrom
laileni-aws:feature/qOnly
Jan 27, 2026
Merged

fix(amazonq): Merge from main#8533
manodnyab merged 2 commits intoaws:feature/qOnlyfrom
laileni-aws:feature/qOnly

Conversation

@laileni-aws
Copy link
Contributor

  • Merge Amazon Q necessary code from main.
  • Cherry picking commits a2849d0 and 53f02cf

  • Treat all work as PUBLIC. Private feature/x branches will not be squash-merged at release time.
  • Your code changes must meet the guidelines in CONTRIBUTING.md.
  • License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

## Problem
- This setting is no longer used.
<img width="1276" height="242" alt="image"
src="https://github.com/user-attachments/assets/71c2a761-e849-4058-ac99-41329cd32c28"
/>


## Solution

- Removing /dev amazonq settings
---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
@laileni-aws laileni-aws requested a review from a team as a code owner January 27, 2026 02:09
@github-actions
Copy link

  • This pull request modifies code in src/* but no tests were added/updated.
    • Confirm whether tests should be added or ensure the PR description explains why tests are not required.

@laileni-aws laileni-aws enabled auto-merge January 27, 2026 02:09
@laileni-aws laileni-aws force-pushed the feature/qOnly branch 3 times, most recently from 15a6e8a to f8ff624 Compare January 27, 2026 04:41
This merges the released changes for rc-20260122 into main.
MCM-XXX

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: aws-toolkit-automation <>
auto-merge was automatically disabled January 27, 2026 05:33

Pull request was closed

@laileni-aws laileni-aws reopened this Jan 27, 2026
@laileni-aws laileni-aws enabled auto-merge January 27, 2026 18:24
@laileni-aws
Copy link
Contributor Author

CI Issue:

The CI builds are stuck because GitHub Actions is still expecting jobs that no longer exist in the workflow matrix.
Looking at the current node.js.yml, I already removed toolkit from the package matrix:

  • macos job: package: [amazonq] (toolkit removed)
  • windows job: package: [amazonq] (toolkit removed)

GitHub's branch protection rules or required status checks are still configured to expect:

  • test macOS (18.x, stable, toolkit)
  • test Windows (18.x, stable, toolkit)

These jobs will never run because they no longer exist in the workflow, so GitHub keeps waiting for them.

Solution:

Go to Settings → Branches → Branch protection rules for master

Under Require status checks to pass before merging, remove:

  • test macOS (18.x, stable, toolkit)
  • test Windows (18.x, stable, toolkit)

@manodnyab manodnyab disabled auto-merge January 27, 2026 22:49
@manodnyab manodnyab merged commit fbff050 into aws:feature/qOnly Jan 27, 2026
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants